From: Glenn Morris Date: Sun, 15 Jun 2014 00:06:30 +0000 (-0700) Subject: Merge from emacs-24; up to 2014-06-03T06:51:18Z!eliz@gnu.org X-Git-Tag: archive/raspbian/1%29.2+1-2+rpi1^2~5^2~23^2~3423^2~709^2~704 X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=90de50e27049ae19492dd9843e50618ea4ed5d14;p=emacs.git Merge from emacs-24; up to 2014-06-03T06:51:18Z!eliz@gnu.org --- 90de50e27049ae19492dd9843e50618ea4ed5d14 diff --cc ChangeLog index 90a1ce7c0c0,fd87a78c7c8..2c3e6c722a5 --- a/ChangeLog +++ b/ChangeLog @@@ -1,45 -1,22 +1,53 @@@ -2014-06-14 Paul Eggert ++2014-06-15 Paul Eggert + + Port part of the AIX fix to Solaris (Bug#17598). + * configure.ac (_REENTRANT): Define on Solaris if HAVE_PTHREAD. + This ports part of the recent AIX fixes to Solaris. It is needed + for the same reason that _THREAD_SAFE is needed on AIX, e.g., to + make sure that each thread has its own 'errno'. + +2014-06-13 Glenn Morris + + * Makefile.in (CC, CFLAGS, LDFLAGS, CPPFLAGS, abs_top_srcdir): + Remove, no longer used. + (lib, lib-src, lisp, nt, src, blessmail, install-arch-dep) + (install-nt, install-strip, uninstall, uninstall-nt) + (mostlyclean, clean, distclean, bootstrap-clean) + (maintainer-clean, extraclean, TAGS, tags, check, $(DOCS)): + ($(INSTALL_DOC), $(UNINSTALL_DOC), info, bootstrap, check-declare): + GNU make automatically passes command-line arguments to sub-makes. + 2014-06-11 Paul Eggert - Backport fcntl.h AIX fix from the trunk (Bug#17598). - This fixes a bug with the shell freezing. See: - http://debbugs.gnu.org/cgi/bugreport.cgi?bug=17598#185 - Merge from gnulib, incorporating: - 2014-05-31 dup2, fcntl, fcntl-h: port to AIX 7.1 - * lib/fcntl.in.h, m4/dup2.m4, m4/fcntl.m4: - Update from gnulib. + Use a shell function in configure.ac to cut down on code duplication. + * configure.ac (emacs_check_gnu_make): New shell function. + Use it to avoid duplication when checking for GNU Make. + It's OK for 'configure' to use shell functions these days, + as long as we follow the advice in the 'Shell Functions' + section of the Autoconf manual. + +2014-06-11 Glenn Morris + + * configure.ac: Require at least version 3.81 of GNU make. -2014-06-07 Paul Eggert +2014-06-10 Paul Eggert + + Rely on AC_CANONICAL_HOST to detect whether we're using mingw. + See the thread containing: + http://lists.gnu.org/archive/html/emacs-devel/2014-06/msg00206.html + * configure.ac (AC_CANONICAL_HOST): Invoke this as early as we + can, which is just after AM_INIT_AUTOMAKE. Then check for mingw + just after that. + +2014-06-10 Glenn Morris + + * Makefile.in (AUTOCONF, AUTOMAKE, AUTOHEADER, ACLOCAL): + New, set by configure. Use throughout where appropriate. + + * Makefile.in (INFO_EXT): Remove and replace by ".info" throughout. + * configure.ac (INFO_EXT, INFO_OPTS): Remove output variables. + +2014-06-08 Paul Eggert Port better to AIX (Bug#17598). * configure.ac (with_xpm_set): New shell var. diff --cc configure.ac index 0f7d858bd60,702b8570577..c24469a0bb0 --- a/configure.ac +++ b/configure.ac @@@ -2082,26 -2064,45 +2082,30 @@@ if test "$ac_cv_header_pthread_h"; the if test "$GMALLOC_OBJ" = gmalloc.o; then emacs_pthread_function=pthread_atfork else - emacs_pthread_function=pthread_self + emacs_pthread_function=pthread_kill fi - AC_CHECK_LIB(pthread, $emacs_pthread_function, HAVE_PTHREAD=yes) -fi -if test "$HAVE_PTHREAD" = yes; then - case "${canonical}" in - *-hpux*) ;; - *) LIB_PTHREAD="-lpthread" - LIBS="$LIB_PTHREAD $LIBS" ;; - esac - AC_DEFINE(HAVE_PTHREAD, 1, [Define to 1 if you have pthread (-lpthread).]) - - # Some systems optimize for single-threaded programs by default, and - # need special flags to disable these optimizations. For example, the - # definition of 'errno' in . - case $opsys in - sol*) - AC_DEFINE([_REENTRANT], 1, - [Define to 1 if your system requires this in multithreaded code.]);; - aix4-2) - AC_DEFINE([_THREAD_SAFE], 1, - [Define to 1 if your system requires this in multithreaded code.]);; - esac + OLD_LIBS=$LIBS + AC_SEARCH_LIBS([$emacs_pthread_function], [pthread], + [AC_DEFINE([HAVE_PTHREAD], [1], + [Define to 1 if you have pthread (-lpthread).]) + # Some systems optimize for single-threaded programs by default, and + # need special flags to disable these optimizations. For example, the + # definition of 'errno' in . - if test "$opsys" = aix4-2; then - AC_DEFINE([_THREAD_SAFE], [1], - [Define to 1 if your system requires this in multithreaded code.]) - fi]) - if test "X$LIBS" != "X$OLD_LIBS"; then ++ case $opsys in ++ sol*) ++ AC_DEFINE([_REENTRANT], 1, ++ [Define to 1 if your system requires this in multithreaded code.]);; ++ aix4-2) ++ AC_DEFINE([_THREAD_SAFE], 1, ++ [Define to 1 if your system requires this in multithreaded code.]);; ++ esac]) ++ if test "X$LIBS" != "X$OLD_LIBS"; then + eval LIB_PTHREAD=\$ac_cv_search_$emacs_pthread_function + fi + LIBS=$OLD_LIBS fi AC_SUBST([LIB_PTHREAD]) - -AC_CHECK_LIB(pthreads, cma_open) - -## Note: when using cpp in s/aix4.2.h, this definition depended on -## HAVE_LIBPTHREADS. That was not defined earlier in configure when -## the system file was sourced. Hence the value of LIBS_SYSTEM -## added to LIBS in configure would never contain the pthreads part, -## but the value used in Makefiles might. FIXME? -## -## -lpthreads seems to be necessary for Xlib in X11R6, and should -## be harmless on older versions of X where it happens to exist. -test "$opsys" = "aix4-2" && \ - test $ac_cv_lib_pthreads_cma_open = yes && \ - LIBS_SYSTEM="$LIBS_SYSTEM -lpthreads" +fi dnl Check for need for bigtoc support on IBM AIX diff --cc doc/lispref/ChangeLog index fd50c2aebdc,c20a20409a2..f7c0d14abb3 --- a/doc/lispref/ChangeLog +++ b/doc/lispref/ChangeLog @@@ -1,14 -1,8 +1,19 @@@ -2014-06-14 Eli Zaretskii ++2014-06-15 Eli Zaretskii + + * commands.texi (Accessing Mouse): Improve the wording of the + posn-col-row documentation. (Bug#17768) + +2014-06-10 Glenn Morris + + * Makefile.in (INFO_EXT): Remove and replace by ".info" throughout. + (INFO_OPTS): Set directly rather than with configure. + +2014-06-09 Paul Eggert + + Say (accept-process-output P)'s result pertains to P if P is non-nil. + * processes.texi (Accepting Output): Mention that if PROCESS is non-nil, + the return value is about PROCESS, not about other processes. + 2014-06-08 Glenn Morris * os.texi (Startup Summary): Small fix for initial-buffer-choice. diff --cc lisp/ChangeLog index bd8bd6ac1e0,3990d4d0106..d722c521b55 --- a/lisp/ChangeLog +++ b/lisp/ChangeLog @@@ -1,125 -1,27 +1,150 @@@ - 2014-06-14 Ron Schnell -2014-06-14 Glenn Morris ++2014-06-15 Glenn Morris + + * progmodes/cc-langs.el: Require cl-lib. (Bug#17463) + Replace delete-duplicates and mapcan by cl- versions throughout. + And cl-macroexpand-all by macroexpand-all. + (delete-duplicates, mapcan, cl-macroexpand-all): No need to declare. + -2014-06-14 Eli Zaretskii ++2014-06-15 Eli Zaretskii + + * subr.el (posn-col-row): Doc fix. (Bug#17768) + -2014-06-14 Juri Linkov ++2014-06-15 Juri Linkov + + * bindings.el: Put `ascii-character' property on keypad keys + mapped to characters. (Bug#17759) + -2014-06-13 Stefan Monnier ++2014-06-15 Stefan Monnier + + * emacs-lisp/smie.el (smie-next-sexp): Fix up "other-end" info when + bumping forward into a closing paren (bug#17761). + + * term/xterm.el (xterm--version-handler): Work around for OSX + Terminal.app (bug#17607). + ++2014-06-14 Ron Schnell ++ + * play/dunnet.el If a lamp is in the room, you won't be eaten by a grue. - ++ +2014-06-13 Glenn Morris + + * Makefile.in ($(lisp)/cus-load.el, $(lisp)/finder-inf.el) + (autoloads, $(lisp)/subdirs.el, compile-main, leim, semantic, compile) + (compile-always): GNU make automatically passes + command-line arguments to sub-makes. + + * calendar/calendar.el (calendar-generate-window): + Remove pointless call to font-lock-fontify-buffer. + +2014-06-13 Matthias Meulien + + * simple.el (completion-list-mode-map): Navigate with tab and backtab + (bug#17767). + +2014-06-13 Stefan Monnier + + * simple.el (set-mark-command): Simplify a bit. + +2014-06-12 Nicolas Richard + + * help.el (help--key-binding-keymap): New function. + (help--binding-locus): New function. + (describe-key): Mention the keymap in which the binding was + found. (bug#13948) + +2014-06-12 Stefan Monnier + + * hippie-exp.el (he--all-buffers): New function. + (try-expand-line-all-buffers, try-expand-list-all-buffers) + (try-expand-dabbrev-all-buffers): Use it. + +2014-06-12 Emilio C. Lopes + + * hippie-exp.el (try-expand-line-all-buffers) + (try-expand-list-all-buffers, try-expand-dabbrev-all-buffers): + Read hippie-expand-only-buffers and hippie-expand-ignore-buffers in the + original buffer, in case they're buffer-local. + +2014-06-12 Vincent Belaïche + + * ses.el (ses-initial-global-parameters-re): New defconst, a + specific regexp is needed now that ses.el can handle both + file-format 2 --- ie. no local printers --- and 3 --- i.e. may have + local printers. + (ses-localvars): Add local variables needed for local printer handling. + (ses-set-localvars): Handle hashmap initialisation. + (ses-paramlines-plist): Add param-line for number of local printers. + (ses-paramfmt-plist): New defconst, needed for code factorization + between functions `ses-set-parameter' and + `ses-file-format-extend-paramter-list' + (ses-make-local-printer-info): New defsubst. + (ses-locprn-get-compiled, ses-locprn-compiled-aset) + (ses-locprn-get-def, ses-locprn-def-aset, ses-locprn-get-number) + (ses-cell-printer-aset): New defmacro. + (ses-local-printer-compile): New defun. + (ses-local-printer): New defmacro. + (ses-printer-validate, ses-call-printer): Add support for local + printer functions. + (ses-file-format-extend-paramter-list): New defun. + (ses-set-parameter): Use const `ses-paramfmt-plist' for code + factorization. + (ses-load): Add support for local printer functions. + (ses-read-printer): Update docstring and add support for local printer + functions. + (ses-refresh-local-printer, ses-define-local-printer): New defun. + (ses-safe-printer): Add support for local printer functions. + +2014-06-12 Ivan Andrus + + * ffap.el (ffap-lax-url): New var (bug#17723). + (ffap-url-at-point): Use it. + (ffap-file-at-point): Avoid returning just "/". + +2014-06-12 Matthias Meulien + + * progmodes/python.el (import skeleton): New skeleton (bug#17672). + (python-mode-map): Bind it. + + * progmodes/python.el (class skeleton): Don't erase last char of class + name (bug#17683). + +2014-06-12 Cameron Desautels (tiny change) + + * help.el (where-is): Use `default' arg of completing-read (bug#17705). + +2014-06-12 Kevin Ryde + + * files.el (auto-mode-alist): Map .ad files to xdefaults-mode + (bug#17745). + +2014-06-12 Stefan Monnier + + * international/mule-cmds.el: Use lexical-binding. + (ucs-names): Simplify. + +2014-05-18 Eric Hanchrow + + * progmodes/python.el (run-python): Use read-shell-command. + +2014-06-11 Stefan Monnier + + * rect.el: Make it possible to move bounds past EOL or into TABs. + (operate-on-rectangle): Use apply-on-rectangle. + (rectangle--mark-crutches): New var. + (rectangle--pos-cols, rectangle--col-pos, rectangle--point-col) + (rectangle--crutches, rectangle--reset-crutches): New functions. + (apply-on-rectangle): Obey crutches. Avoid setq. + Fix missing final iteration if end is at EOB&BOL. + (rectangle-mark-mode-map): Add remap bindings for + exchange-point-and-mark and char/line movements. + (rectangle--*-char): New function. + (rectangle-exchange-point-and-mark, rectangle-right-char) + (rectangle-left-char, rectangle-forward-char) + (rectangle-backward-char, rectangle-next-line) + (rectangle-previous-line): New commands. + (rectangle--place-cursor): New function. + (rectangle--highlight-for-redisplay): Use it. Use apply-on-rectangle. + 2014-06-08 Glenn Morris * startup.el (initial-buffer-choice): Doc fix. diff --cc src/ChangeLog index 5fc04c10f59,6e312e79d7d..1bb96989b60 --- a/src/ChangeLog +++ b/src/ChangeLog @@@ -1,36 -1,15 +1,46 @@@ -2014-06-14 Eli Zaretskii ++2014-06-15 Eli Zaretskii + + * xdisp.c (Fmove_point_visually): Don't use the glyph matrix + information if we are in the middle of executing a keyboard macro, + since redisplay doesn't update the screen until the macro is + finished. (Bug#17777) + -2014-06-13 Eli Zaretskii - + * alloc.c (cleanup_vector): Don't dereference a font driver + pointer if it is NULL. (Bug#17771) + +2014-06-13 Glenn Morris + + * Makefile.in ($(leimdir)/leim-list.el, $(srcdir)/macuvs.h) + ($(lispsource)/international/charprop.el) + ($(libsrc)/make-docfile$(EXEEXT), $(lwlibdir)/liblw.a) + ($(oldXMenudir)/libXMenu11.a, ns-app, .el.elc) + ($(lispsource)/loaddefs.el, bootstrap-emacs$(EXEEXT)): + GNU make automatically passes command-line arguments to sub-makes. + +2014-06-13 Paul Eggert + + Avoid hangs in accept-process-output (Bug#17647). + * lisp.h, process.c (wait_reading_process_input): + Return int, not bool. All uses changed. + * process.c (SELECT_CANT_DO_WRITE_MASK): + Remove macro, replacing with ... + (SELECT_CAN_DO_WRITE_MASK): ... new constant, with inverted sense. + All uses changed. + (status_notify): New arg WAIT_PROC. Return int, not void. + All uses changed. + +2014-06-13 Eli Zaretskii + + * menu.c (Fx_popup_menu): Don't call the frame's menu_show_hook if + the frame is the initial frame, because the hook is not set up + then, and Emacs crashes. + Reported by Fabrice Popineau . + +2014-06-12 Stefan Monnier + + * keymap.c (silly_event_symbol_error): Don't recommend the use + of strings. + 2014-06-11 Eli Zaretskii * xdisp.c (set_cursor_from_row): Fix an off-by-one error when